Fix null pointer exception when surveys are turned off am: 9db3cb3bee
am: e2904eb7fa  -s ours

Change-Id: I3ebd619327fa399e8fab9ead6e1de63a67ce1306