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

Merged-In: Ia185480829c5cd4e06853082845c848e2fa931c9
Change-Id: Ifedfded14850aea33fbf981de40dca5e224d1515