Merge "Add the instructions to resolve ABI difference"