Merge "Test of retry of failed module sync"