r7

Change-Id: I808da2c3019eac0ceaf5d315f3f4a4b47660148f

Conflicts:
	default.xml