Merge "Fix for bug 3434228" into honeycomb-mr1