Version 1.7

Change-Id: Iac99dcf9decd4220077e2444dc8a29730466b15f