Merge "Merge "Centre clock text on visible characters instead of : character" into cw-f-dev am: ad7c7acad6 am: 43b08e2fb3" into nyc-mr2-dev-plus-aosp