Merge stage-dr1-aosp-master into stage-aosp-master am: 80f754859d am: 6b8c7867ec
am: b88c96f2ef

Change-Id: Ia62e32b42ff33e91db890af0e552f781fb260e02