Merge "Clean up obsolete aliases for Truth." into udc-qpr-dev-plus-aosp