Merge "Keyguard: Remove fancy colon" into oc-dr1-dev
am: 55bc522d0d

Change-Id: I4d2297e7ef81876044fc49ead7187cacf20c0520