Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: 831ddd86 am: d72ccf31 Change-Id: I30d4b05debc4c95313645cdccce10237ac451b26