Merge remote-tracking branch 'goog/jb-ub-mail-ur9' into merge

Merge UR8 into MR2.

Change-Id: Ia04852cf84c05ab2ee4898662d347a06d40e5f11