Merge "DO NOT MERGE" into gingerbread