Merge "Don't allow shell to spoof initiating package name." into rvc-dev