Merge stage-dr1-aosp-master into stage-aosp-master
am: 152ea4e031

Change-Id: I65f5fff5a2f6b8cfb748336521c9367343b9227b