Merge "Fix issues #4087362 and #4087356" into honeycomb-mr1