am 55e81bd0: Merge "Improve how we manage the previous app." into ics-mr1

* commit '55e81bd0f219acbe00bbeebc8d33ef9c67a4aa60':
  Improve how we manage the previous app.