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