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

Change-Id: I49a285426305407954f2c8626724e96b954ed17d