am a58c03f6: am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"

* commit 'a58c03f603cd90d1fed5566c88af5cd6c6f4caf5':
  Fixed upgrading from forward-lock application to system application