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

Change-Id: I5af717ca6722040377a4cc29d533704eb568b333