Merge "Fix issue #7649720: ANR occur when OTA with lower version..."