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

Merged-In: I2297b003c61c2e781b277d0ccfb7e9b715635978
Change-Id: I5fcea49e0ecab3433a0e369a44d42569ac5d40ae