4.4.2_r1 -> 4.4.2_r2

Change-Id: I88d21c3cfd138dd8d5b23c23b5d294c138663850

Conflicts:
	default.xml
clean up

Change-Id: I3f5aa549913cc65e48245e0d2dd7474459b27b36