Fix XWALK-1539 XWALK-1541