Followup. Pressed save + merge too fast

Change-Id: Iffd7b52f15779f730a7ffea83f96e82b4c6b0b4f