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

Change-Id: I501112ef037414f6b757bd5d4f532a59175e2c36