am bb33ad33: am 607984a2: am 3b6053fb: Merge "Lose some deprecated test annotations."

* commit 'bb33ad331baadcd6a515d061b56add1ff6675e28':
  Lose some deprecated test annotations.