reimport default.xml to fix merge issues

Change-Id: I059d594d11e3b20018202b425b56c41849460a89