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

Change-Id: Ib87ab67fad134e5c146b07e53cb9d5a05d72b120