Merge "Throw a checked exception on inconsistent installs." into mnc-dev