Merge "Make sure we get valid package name or fail." into mnc-dev