am ca050ab2: Merge "Update BiDiTest app"

* commit 'ca050ab2732a67bd989b5111a8e33ea011d6406c':
  Update BiDiTest app