Off to JDQ39E

Change-Id: I217aedb4419acebafa9f2f79001d3b999389351f

Conflicts:
	default.xml