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

Change-Id: Id6db9bf2da578a6517f33e371e0a2800474ffe66