Merge "Allow boot clock to be toggled between 12 and 24 hour format" into...
Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev am: 71a865d2 am: cb3a1095
am: a843cbc4
Change-Id: I8437c4528acbc2b2b7224baabf45611dbed70446