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

Merged-In: I95a48cbc91399c2d8c8396689eae8e9b34dadc66
Change-Id: I048709a2a2e1d782131e1260b8e675ce409dc150