Merge "Add null check for Nullable argument." into pi-dev
am: 335b0d36da

Change-Id: I610900225de4a9da865599284d083bfcdf726966