Merge  'goog/jb-dev' into 'goog/jb-ub-mail'

Change-Id: Ie4a4967ac045cff6b45b92472a82c41d50f4eaa5