Resolve race condition in old API message handler

Bug: 110358843
Test: Run CHQTS, verify pass
Change-Id: I51daf13ed1dd2accd82a4a77284089ede72e019b
1 file changed