Merge commit 'goog/gingerbread' into gingerbread-release