Fix..

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

Conflicts:

	default.xml