Merge "Update FIP corrupt address"