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

Merged-In: Iac6689ca06cb524133d0f880b61b56ea21df5261
Change-Id: I3f9ffb1d2b3f37a61c69c8e34ccc0b8fc9dc9668