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

Change-Id: I44ed3b052960f10954db7dd536b7f874cde4a97e