Merge "Remove PMS snapshot lambdas" into tm-dev