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

* commit '55a9be3d284d17045d9d3546c57d9dc3c4c8a521':
  Fix for bug 3434228