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

Merged-In: I943cf84e7d4f50f65e4db66297a1cfaeec80f1d2
Change-Id: I111191e87299b1afef8e9e59ebf6a87e6536d7a2