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

Change-Id: I30aaffb9cb5308d0ecffe5113568707e012ec21d