Merge changes from topic "b150393918-lock-icon-controller" into rvc-dev am: a40c4b47ef am: ab1cb86280 am: adb997ba7e
Change-Id: I626e3442c00e3dc2685638b42e53d49e2a004924
This commit is contained in: