Merge "Fix null pointer exception when surveys are turned off" into nyc-mr2-dev am: 4edcb927ab
am: 387fdd058e  -s ours

Change-Id: I05efb9a970bbd055d37a7bcf7a204675109d4001