Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: 831ddd860f am: d72ccf31d5 am: ae4921bfd9 am: 23cf259411
Change-Id: Idd445f87eb5b16f046d43a5dcf83df0c74103f3c
This commit is contained in: