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