Sync google3 changes. am: 26e8c2edb5
am: 7a1f0fae1e

Change-Id: I06b576d6c95f32509141a3025267ad9af0f5dcc8