Merge "DO NOT MERGE Backport of I1f55df8a from master." into gingerbread