Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD

Change-Id: Ia64f0605c81305f106bfeb298a03b5bdf7735feb