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

Merged-In: I5c239fb24acd53a1a96b245b74a5d27b92e97a1e
Change-Id: I4f517a0cfcb3a733e2185b508d4e20aab5e5b127