Merge stage-dr1-aosp-master into stage-aosp-master
am: 77296107ab

Change-Id: Idc8dfc0126d8621b2d9daf00386b887d89336587