Merge "More durable logging around system app upgrades." into lmp-dev