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

Change-Id: I682654881d370222031e15b74ad8ced47615ab4c