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

Merged-In: Ia9298b79bca6d7b25cdfc6e2718dd997d4ef84b6
Change-Id: I000fad1ecc527f6de8cbd0ce812e08ab7a8ae9d1