Merge "Remove annotations that have been relocated" into rvc-qpr-dev-plus-aosp