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

Merged-In: I0e9307b76dfe9e0b9b5f1ad20ab52e84cc5f1b8b
Change-Id: Ib84685c96ac6b9448656882a2ad963b7248f3804