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

* commit 'e46a5b31d600c55be0d540214f4b3193400b0674':
  Throw a checked exception on inconsistent installs.