am 8f6c5226: am 55a9be3d: Merge "Fix for bug 3434228" into honeycomb-mr1

* commit '8f6c5226c5a0522cf2bbad987004e362098d9464':
  Fix for bug 3434228