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

Merged-In: If889d37eb0a4a280e5a371a10cd9d01e526a06d2
Change-Id: I48d9475f853956c601a8a88adf01e5f4ee67c1fe