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

Merged-In: I059bc6219d1eef3735a30328bdf5d5d744c3d8bc
Change-Id: Ife18fca3918a305ea69865f385e690a871facb1e