Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: a40c4b47 am: 547d3ff0 am: 86af916a Change-Id: Iddb23c6b4e7bb7a721ceace6418b6888b18970f4