am db0d2634: am 818a7bbf: Merge "Better fix for bug 3112733" into honeycomb

* commit 'db0d26348f5db934b1853fbc06b1ef46dd781e3a':
  Better fix for bug 3112733