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

Change-Id: I6ef4b2bcdf7bcfc765efd8b228275d063e7ed141