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

Merged-In: I1a095e8c3049420124baef139edacdfdd5747980
Change-Id: I30b71cd8e60526def44f87137037b965d969834c