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

Change-Id: I9aef4c0fe65d1bb769f37c7e0aeecdcb10ccd2af