Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: a40c4b47ef am: 547d3ff016 am: 86af916ac8
Change-Id: Iddb23c6b4e7bb7a721ceace6418b6888b18970f4
This commit is contained in: