fix snapshot module dependency cycle

Change-Id: Idcbb299666e764d7b0dd704597c78f5bf356a74b