Merge "Add native bridge controller to some modules" into pi-dev
am: 12321470da

Change-Id: I8facc585658eebb4c96dbeb07ddc82b9637de69c