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

* commit '88d1bc0ebd7a02c36e64a1e46ad5678d521b955d':
  NativeBridge: Refactor for new initialization flow