[automerger skipped] Merge "Fix testRegisterUsageCallback failure in setUp" am: c68f5313a2 am: a788c6816b
am: 6e9c16f89e  -s ours

Change-Id: I6ac57830e6c5669f24d7b2195632f578e2c7fb84