Merge "Fix statsd NPE on setPullAtomCallback" into rvc-dev am: 6dfbdb3e2f

Change-Id: I4d9efb78fa508218dc68aa75444cb99d2ebaef3e