Merge "DO NOT MERGE ANYWHERE Support library 25 is now 25 r36" into nyc-mr1-dev