Merge stage-dr1-aosp-master into stage-aosp-master
am: 999ebe49b3

Change-Id: I89acd91c310ca863a78da4bf6e3cd86f6f9f75ba