Merge "Remove annotations that have been relocated" into stage-aosp-master