Merge stage-dr1-aosp-master into stage-aosp-master
am: 4a1070631d

Change-Id: Ibb1ff890d503003aadde778d308c5918b8a7f06e