ac946d2141
Change-Id: If9e4c1513553c4bd10fd3b91c28c4d3f806ed816 Story: #2007686 Task: #40047 (cherry picked from commit 0c1818fbb02b5ff6a9a5157d4bbb58314242c806)