Changed to version 1.7 and made it compatible with that.

Change-Id: Ic0aa264763b80291d9f8191d57c9b7abd6b685f8