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

Merged-In: Iad85d5e2afed841718db70c9de1f77dc90df8acc
Change-Id: I45a3fa76d6f66181705a1faf599e7f9839750a38