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

Merged-In: I937e1382b9968adff860f2295cb4052f8d183436
Change-Id: I6ee17a46a996524dae41452ca769c88fdea78e3e