am 8e4d3ba6: Merge "Fix bug 3339039 - Preserve proper behavior for action button text when updated." into honeycomb

* commit '8e4d3ba67824d87d832d90e1d0555456b3e76aca':
  Fix bug 3339039 - Preserve proper behavior for action button text when updated.