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

Merged-In: I9faec34655d6adf3f79387ad6db4483409515fb6
Change-Id: I915f96bf32ecee36b0a5c74f57614ded894c472e