Merge "Upgrade native bridge to version 3 to support namespace" am: 28c0c0762e
am: 996cfc70a0

Change-Id: I396a056516354acedd610065a7c9ed97b7ca7c37