am 34f230aa: am c5418198: am 3438bc1b: Merge "Correctly rollback failed system app installs." into lmp-dev

* commit '34f230aa4ad6043d3b0dd0d3942a51624468e81c':
  Correctly rollback failed system app installs.