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

Merged-In: I4d37c5762a0589edecf5880b6b325746481efd31
Change-Id: I8a6be146994300bfcacb55ed125ba6f64d1c2d25