Pr1763

cherry-pick patch of XWALK1618 to beta branch (XWALK1763).