jira: none Change-Id: I6ea5bd463918109763f6550188adbbc0733cedc6 (cherry picked from commit 41551af46371a5b7e340d8674d333b738b7f9d05)