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

* commit '818a7bbfb42061d67aae0d5c725cecd0261c9643':
  Better fix for bug 3112733