Merge "Cherry-pick from master:  Fix issue #3324032:" into honeycomb-mr1