840a257b9e
CRs-fixed: 346154 (cherry picked from commit a235dd6b4e8efe3cc432057806b3d5fb2cb4881d) Change-Id: Ie657f6e52df5a4b39c9fa04e74aabe1135e5bdd5