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

Change-Id: Idf69de6d3574c90ea57a44e51c6f95b81a1945d0