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

Change-Id: Ia526312918c3d46d1ab8a48acb4ed3c47d58d524