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

Merged-In: I29c9fbb6fa3ecf335a3334a4a7365f86ef013542
Change-Id: Iea25ab2acc22bf7e8dea6afeb5b26df04502e956