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

Merged-In: If3d36c15e515f85cd778a82be849fe01294b0ef1
Change-Id: Ic0b62464a326d6a7b6afd823414c6c8fd0d67547