Merge "Fix statsd NPE on setPullAtomCallback" into rvc-dev am: 6dfbdb3e am: 146263cb am: 911fc8ab Change-Id: Id237a0bf7ec7d870b545e856dc1158df61d071f7