Merge "Fix statsd NPE on setPullAtomCallback" into rvc-dev am: 6dfbdb3e am: cb9c98dd am: d976e3cb am: fe3f3941 Change-Id: I41d582619b29f9a188772312b0d4f6e3826a2740