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