Clean-up

Back to 4.4.4_r2

Change-Id: Ic759c772d1b1569b6eaf6d5252475615a558c625
Signed-off-by: Chintan Shah <cgintan1998@gmail.com>

Conflicts:

	default.xml