Merge stage-dr1-aosp-master into stage-aosp-master
am: 941185b84f

Change-Id: I435e644305d986d3d359f7e97086637d00c50b6c