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

Change-Id: I40ffce9b8e434bdbbb9aa6710e3dba9666539043