Merge "Allow boot clock to be toggled between 12 and 24 hour format" into cw-f-dev am: 71a865d22d am: cb3a109506
am: a843cbc411

Change-Id: I8437c4528acbc2b2b7224baabf45611dbed70446