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

Merged-In: I4a7fb4918fed2d27b1803bd6ddc9b110dda6e3d9
Change-Id: I8365f0ce1170d0c85b5c5b80ce8370f5ad629a09