Merge "BLASTSyncEngine: Add timeouts" into rvc-dev am: 03c06c01c9 am: 453d2e7dd4

Change-Id: I4d9d423dd0f27679c87e827c33d2d8b201f29a18