Merge "Merge "Support library 24.2.0 API diff" into nyc-dev am: 9d25bf73a4 am: 8bb074c737" into nyc-mr1-dev-plus-aosp