Merge remote-tracking branch 'goog/master' into stage-aosp-master
am: a419ba2940

Change-Id: Iae65e2b5b17cb5f8ce8fd57401357edbc0e53aeb