Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: 831ddd860f am: d72ccf31d5

Change-Id: I30d4b05debc4c95313645cdccce10237ac451b26