Merge "Bug-2692:Avoid fake snapshot during initiate snapshot"