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

Merged-In: Iaa681f78d6daf89cdfa3e7dc2aee56b970f5c8bb
Change-Id: Id666e2793d42ad6028265fa340ecf4e75ed5a5b5