jira: none Change-Id: I574a42a6c17ded0934ae7456eb5ecfc83a5c2a01 (cherry picked from commit 0ed3f527f08808d9ec04f09b5eb114334805be29) (cherry picked from commit c81b2e8cb39400255b2cf1321d2fdb346300fdad) (cherry picked from commit 49f2ed61664c663c189db6a2c94efd6a36d53b9b)