Merge "Update build to R34, 25.0.0-SNAPSHOT" into nyc-mr1-dev