Merge stage-aosp-master into pi-dev-plus-aosp
am: 3574ac5cff

Change-Id: I526e1ec56871d4b132578591e27477dbe17656d5