Merge "Remove incorrect annotation." into tm-dev