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

Change-Id: Idb7a28cf53e4c1b963df2dc0aff8de47d9ca8069