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

Change-Id: I02a6acca4f15b665cf5b5f3f19d1df07b65264cb