am f2c616ed: Merge "Partially revert package freezing" into mnc-dev

* commit 'f2c616ed02aee3b9a9025caf288aadbf22cfd046':
  Partially revert package freezing