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

Change-Id: Ie0ab024e908d56614957982b5726954402766965