Merge "Fixed an issue where the lock icon could be invisible" into oc-dr1-dev am: 106b5eefd2 am: 1f98df1489
am: 29f86c3713

Change-Id: If2cb4b1cc2f640a10020b3e8fd66f116cf4890fd