This patch is a followup of [1] to address review comments. [1] https://review.opendev.org/#/c/705876/ Change-Id: I41edec1877106165576ef6bacff24d354460f2ef