Merge "Change branch name to gingerbread, to match reality - DO NOT MERGE" into gingerbread