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

Change-Id: I553e46846f9bbf7470bcdb43751aba42e9ea20f1