Invert BubbleController <-> NEM dependency

Test: atest
Change-Id: I35b9dfbead7c623a6d0321943570c6115cf7eb5e
4 files changed