am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application...
am 41bfe121: am 16678ac6: Merge "Fixed upgrading from forward-lock application to system application"
* commit '41bfe121':
Fixed upgrading from forward-lock application to system application