Merge "Fix testRegisterUsageCallback failure in setUp"