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

Merged-In: Icdef5c307b4fc8487f5bab9c4aa65f910b970ebb
Change-Id: Ibb600760fd77ad49768bfe2f7beaad1ecdedc6a7