Merge "Fix statsd NPE on setPullAtomCallback" into rvc-dev am: 6dfbdb3e am: cb9c98dd am: 851799bb am: f2779341 Change-Id: I8a6d76d19953519c9380d81b37ac2e7a96108d33