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

Merged-In: I815ef03c93bec8be2340dc340d840895f47ecafe
Change-Id: I2f6316055af5cb77c66ff2a741a2d37db3d1691a