Merge "Remove unnecessary --hide-package options"