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

Change-Id: Ie5a93faa73584c82d189d67fc5726dd1134552bd