jira: none Change-Id: Iac2c267e95ca0589bf2e6d6d536d70d3b3e4a70c (cherry picked from commit 7239f7bfaad2e1dc488118188addda3fb015793a)