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

Merged-In: I73faf2fdc96ed47d3ab85855155ac7bd25925776
Change-Id: Id2b5793f81658da1caf71c3a9ec21148b7009b1b