Merge stage-dr1-aosp-master into stage-aosp-master am: 6e4dc3286c
am: d6fa753c84

Change-Id: I36de5b077fce78a738bdd152cee971b0ecfd8abf