Merge stage-aosp-master into pi-dev-plus-aosp
am: 3fe38c2a29

Change-Id: If24b41ebb67f3b4570c3653c7d5a1d27523576a2