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

Change-Id: Ib4a3a7256cb2d1323abde7345a2df994fbc1bc48