Merge remote branch 'goog/gingerbread' into HC

Change-Id: I03057214d191a5b210dd87ae7c81c453dbc0bc70