Merge stage-dr1-aosp-master into stage-aosp-master am: 999ebe49b3
am: 86f939cc52

Change-Id: I2cf61cf3f58c76386b92755efe6b78a6d7ef4792