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

Merged-In: Ic16933528208098e47018a4d024509a528bf91e9
Change-Id: Ibf8093550cfde749db7ba78ff1d462e090b920ce