JIRA: none Change-Id: Ia842b7de9bd452bdcb5fd6d7e009961b8c04584d (cherry picked from commit 27590be491caeffd3c95ce6becb52cacfb7a174c)