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

Change-Id: I477910de04ef5a9a35d795240b93c3cf56e78042