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

Merged-In: Ia34e31d309e9da8e4599345089b8f81a81ab3586
Change-Id: I21a96fc397ea334aed897d27353d475eab00532f