Merge stage-dr1-aosp-master into stage-aosp-master
am: 7a1a754f51

Change-Id: I5ec1bce1f95820f0dc3a58c5dbaad983c327e93d