Merge \\\"Fix infinite loop when registering data usage callback.\\\" into nyc-dev am: c20ffc2a9e am: 13cf0e7d54
am: 1d4fd3ed27

Change-Id: I5140373d930726e0b93fa62ac03315a37c581b5b