Merge stage-dr1-aosp-master into stage-aosp-master
am: ec037c9092

Change-Id: Ifc27f22fa368ca8259a9e51a410adbfc253b4caf