Merge "Manual merge of change 53051 from master (DO NOT MERGE)" into gingerbread