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

Change-Id: I0793e943dabbf6757bedcd01b3749014e686c6e4