am 8bb8dc9b: Merge "Update BiDiTests app"

* commit '8bb8dc9b5f67d6c82d18da4ea46053ea80b75c84':
  Update BiDiTests app