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

Merged-In: I027bcb6d53f721a7f7bb36ba005372f69b0560f9
Change-Id: I05e4aa3a0ce2a4412547246cfe28841bd54aac4c