Merge "Content and settings shell commands passing invalid calling package."