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

Merged-In: I97e491e2c84186e1dd4a4db1852089b38a9b3ddc
Change-Id: I9005a2833ba6df815b108ff213286afca56df475