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

Merged-In: I516e2b8a1a7941ef51a2d5516971ec6009f32be6
Change-Id: I71695e4d74dbfc74ed335b524e35db7a6f606166