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

Merged-In: I0d07b4841f610dfa4b12de9523277f8b9ab27e9f
Change-Id: I91645ac90b6665bcbd9b2169eda92a067e83add3