Merge stage-dr1-aosp-master into stage-aosp-master
am: 031825f99d

Change-Id: I47605b9ae384c03a22739f3ec201b8f4705f7f17