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

Change-Id: I57a1c1c8c6676830be54203f7f7fc9f33dfd0310