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

Merged-In: I889df6bc8c2d4e97c43bbd83410b12d6c8becd25
Change-Id: Iccee4ffe208d24468016c890d7eb0119c0773045