Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
am: dab07e7d85

Change-Id: I1bfcb9306f5ced84822029a5934eb883f4c31966