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

Merged-In: Ia474924b876de74dac46bad9a8bce348e7c2b671
Change-Id: I5b235cdf4ae9572bb3768d75bd58e5a7dd9967e6