Merge stage-dr1-aosp-master into stage-aosp-master
am: 3bf370a348

Change-Id: Id2b04475ecd53996b6ebd516bbb9b1f3410398f7