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

Merged-In: I56bdb1e13d17b180bdbb133ae4d2c10839b371c5
Change-Id: I5f9ad0a715a530e3209c24fab8d97612fff63ab5