Merge "Add maximum time-out to sync operation" into lmp-dev