am 8e10bfd9: am 88d1bc0e: Merge "NativeBridge: Refactor for new initialization flow"

* commit '8e10bfd9cc543fdec8fec26c320f649f72b15e3b':
  NativeBridge: Refactor for new initialization flow