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

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