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

Merged-In: Ic51ea9d199e6a072168365aeb7553203cd2c43c6
Change-Id: I73e01a9461ec61f09c776977b1ecb49ad9de991d