Merge "Keyguard: Fix date capitalization context" into oc-dev am: f58fae54bf
am: 59541bcb0c

Change-Id: I051e510965454a21be26fedf1d4712fffaf2ca23