Nullable convert

Change-Id: I3a1b5219b856216d46d914b315f2c2116e7d5fc2