[automerger skipped] DO NOT MERGE Adding additional null checks for BubbleController. am: b7fc7fd466
am: 2466763f7c -s ours
am skip reason: subject contains skip directive

Change-Id: Ia4ee8e3083821bb0b4b2254fa8dc10bb44de02d7