jira: none Change-Id: Id1a6ea1107b8672182f86e16f2093b661d8f8966 (cherry picked from commit fceb5ec5aa0248787abc362bdb8f2bf2b9c135c0)