Merge "Fix an app data removal issue during OTA update" into sc-dev