Merge "Add SIM_PUK2 for Icc VTS tests" into pi-dev