Merge stage-dr1-aosp-master into stage-aosp-master
am: b199eeb091

Change-Id: If5c51fcd7800189dfaf7b2fec7e7ffedff779b68