Merge "Support library 24.2.0 API diff" into nyc-dev