Merge "Final final final Gingerbread MR API changes." into gingerbread