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

Merged-In: I64b9590e5c1dc05207d50437b2e0f73e0d9514d5
Change-Id: If7ae41e3cfcc6be79623ae20e56867f7c4d66325