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

Merged-In: Ieae6aa97bd6fd4ce3851a8887c0818d8dfa53848
Change-Id: I68b35848a5369cb2ef0186cbe87594318304ff74