Merge "Move the right method to max-sdk-o list."