Merge "Use more inclusive terms." into rvc-dev-plus-aosp