Merge "Fixed upgrading from forward-lock application to system applic…  …ation" into kk4.4