Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb