Merge "Lose sync to toybox."