Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: a40c4b47 am: ab1cb862 Change-Id: Ie79302745e2e97e0248ab099b4e7451896a1bf87