push for weekly 6.8

Change-Id: I0a5c37d6dd76e061fc34432cdae2641b376e5e25

Conflicts:
	config/common.mk