am 9d35c5dc: am 4453d585: am 900e3b5f: Merge "More durable logging around system app upgrades." into lmp-dev

* commit '9d35c5dc79650c5e3781af15f8df5b0d8d078306':
  More durable logging around system app upgrades.