4.4.2_r1 -> 4.4.2_r2

Change-Id: I88d21c3cfd138dd8d5b23c23b5d294c138663850
Merge remote-tracking branch 'cm/cm-11.0' into wszf

Conflicts:
	default.xml

Change-Id: Ia5618af2a47b358682b2dbb2d32ed25f3ab304d9