Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: a40c4b47ef am: 547d3ff016 am: 86af916ac8 am: 5bb088a2d4
Change-Id: If790c5b57c22ea4879b51b2ce1d690025338340d
This commit is contained in: