am 49a13f00: Merge "Remove some stale TODOs from the Java Bridge tests"

* commit '49a13f0052e93dc0b451a4c41bff9b2f8a0286e2':
  Remove some stale TODOs from the Java Bridge tests