Merge "Fix transition library to target Java 1.7" into nyc-mr1-dev