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

* commit '673fed99b931ce0efc17b0e549e7842e4775154c':
  Partially revert package freezing