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

* commit 'b91bf1f3ced1692b30bd731e6f5555a69ad63d72':
  Partially revert package freezing