Use the correct branch for CTS

Change-Id: I2c2d9a02ad2452f5305ceaf03d9f2f28e9fdf154
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2

Conflicts:
	default.xml