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

Merged-In: I175b9acffb34c8934d2f6f95194c3efd349371a0
Change-Id: I49acdc5e1faae55076153904ca3c9f09c791194b