am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1

* commit '4f87a46e6f1a8ba601a320c902abc3d5ce010674':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.