DO NOT MERGE Adding additional null checks for BubbleController. am: b7fc7fd466

Change-Id: I1d8e2003f7984117968c34cbcbe467a141fdfd2a