Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD
am: 1240b14689

Change-Id: Ia8e0ec276ee39be1a3f25b350c023c0852de56cb