Merge "BLASTSyncEngine: Add timeouts" into rvc-dev am: 03c06c01 am: 453d2e7d am: 8cbb0f10 am: 1fb33a9d Change-Id: Iab9c5b238ef8be4062330de0aa0e6b6588160796