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

Merged-In: Icec03f01321c64d95d0bf1487ee9a1f4ae10529f
Change-Id: I0cc1af993adc6a7e27652d5a3ea481ea582d948c