Merge "Fix testRegisterUsageCallback"