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

Merged-In: I1a17b0b27568a8e44a1b41b6336b39b064e66f24
Change-Id: Ic2c3f7fb5d5107f5abaef402f7ed69d6d675e00c