am b5ba804a: Merge "Fix @deprecated javadoc orthography."

* commit 'b5ba804a3b6d00c63a59902b782c11a0af9ed205':
  Fix @deprecated javadoc orthography.