Merge "Move OTA package update before fstrim, hide "Optimizing apps" dialog" into nyc-dev
am: b67b5b9

* commit 'b67b5b9f3c947fc6d835459f0e880eb5fcaad50b':
  Move OTA package update before fstrim, hide "Optimizing apps" dialog

Change-Id: I8dd098ffb1a28c4061135112690fd1bdfca9a1b8