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

* commit '6ff211e08a7c5d51e3899d10be53878c05c244b5':
  Fix for bug 3434228