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

Merged-In: Ia1a2c370112f75b2a6c1d5836016180ca896c261
Change-Id: I3b3ef768bb004daf8222e4171b72b02bb76497ab