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

Change-Id: Ic55a8e7a4a59dcad2b0472f9906fe4393313b5f9