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

* commit '4c423351c0713e8255e32fa0feb7b606fe0c8278':
  Partially revert package freezing