Track M7 locally

Change-Id: I25641dc751319087fe2c02dde2be0aa18d676fdd
Merge "Track M7 locally" into kitkat