Merge "Merge "Give the AM/PM buttons slightly more content area" into nyc-dev am: bacbcba6 am: 82dca237" into nyc-mr1-dev-plus-aosp