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

Change-Id: I29801a940a62d37cad0ed03ee4cf85a80096266e