Merge "Centre clock text on visible characters instead of : character am: 45a7644004 am: 76a3de316c" into nyc-mr2-dev-plus-aosp