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

Change-Id: I37e3b2ca2d54f9f84b3d309ba0b099bd032da65a