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

Merged-In: I8aeb10d7b3fc201e95259ea658efd45357fa5338
Change-Id: I20324e8e87e3b6a942317b79f74d6919f7ead230