Merge "Fix statsd NPE on setPullAtomCallback" into rvc-dev