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

* commit '3b1cfb1d8fdb7310adfe98cbfb568926eb939358':
  More durable logging around system app upgrades.