am f27f2f8f: Merge "Delete old forward-locked apps on upgrade" into jb-dev

* commit 'f27f2f8f71f584471fe558845c24121e957b2cf2':
  Delete old forward-locked apps on upgrade