Merge commit '265f56114' into goog/master

Change-Id: I3fe1bf9a7ca4a832ac8e9ddc34f8f57493cf3c4f