Back-port sync on update fix

Change-Id: Iaf33ff528fac4ea83e1ba57fe2e7e2d8802908ac