Merge stage-dr1-aosp-master into stage-aosp-master am: 0e00e44c08
am: 74dcb8ddf4

Change-Id: I5cb177a8b7184ab88e9074d1be8e2b1fe4279ddd