am 54e53789: Merge "More native bridge tests"

* commit '54e53789549816a67484d8b5f493158ac72d05f8':
  More native bridge tests