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

Change-Id: I1a788a23e132eb61d22d983fa27e8526367eb676