Merge "DO NOT MERGE Cherry-pick of Ie4026a7c back to GB" into gingerbread