Merge "Fix testRegisterUsageCallback failure in setUp" am: c68f5313a2
am: a788c6816b

Change-Id: I5723e356d1b6aa1a71ba693598a5796900fd9ddc