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

Merged-In: I448a17be0704a5f537984335e341a993d2190196
Change-Id: I6bd6f579d7d5e0f47e77a1e3505e3ad913d0fe06