Merge stage-dr1-aosp-master into stage-aosp-master am: 76dd3b23bd
am: 1d31987bef

Change-Id: I81f2abdff413ef73cfa3001977abde844c34b0e2