Merge "Wait for callbacks before exiting test" into rvc-dev am: 65fa221bf6 am: a775cfffca

Change-Id: I5a75f9102e38fc13b3a9a15265807848fcd86cd0