Merge remote-tracking branch 'goog/upstream-master' Test: none Change-Id: If9fbd37d37d42f621a84a3a71379a72a127c0d4d