Merge "Give the AM/PM buttons slightly more content area" into nyc-dev
am: bacbcba682

* commit 'bacbcba682df2d3e08e4e27f1aec3e2e0f57d7e5':
  Give the AM/PM buttons slightly more content area

Change-Id: I381d492942dc6434df222a127c3f4bf6218b9843