Merge "Update clock format when locale list changes" into pi-dev am: 74f5aa0237
am: 0a404e1a49

Change-Id: Ie0cbb4bc1ee25b022a31ac53843630852fbbe95b