Merge "Allow shell/CTS to be package verifier."