Merge "Remove extra horz padding on GlobalActions labels." into oc-mr1-dev
am: 0fe2910c37

Change-Id: Ie21704d19dacd062b96538b7784566f193ef7425