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