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