Support xsi:nil

Change-Id: I56b68a40143c20b15e3b32d9a49d0843803258a3