Merge remote-tracking branch 'goog/master' into HEAD am: 3c7d0cc55f am: 2a4c8d62f7
am: 254cc58b53

Change-Id: If42beeb44d7d03b3a9270a71558938b65baa12ba