Merge sc-dev-plus-aosp-without-vendor@7634622

Merged-In: Idd9a809d1877d428f7b33076a45a1be0c962c5b6
Change-Id: Ic983f30d9643eb1d0af6fd3339c0a2ba38f043a0