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

Merged-In: Ice4803cf91173f070b97bbbfaf8c8929a174fa5a
Change-Id: I010975095b0ed9c1436d971569318b8d45838cdd