Merge "Take package snapshot before locking DomainVerificationService" into tm-dev