Merge "check for column_display_name as null" into rvc-dev am: a3b0760d7c

Change-Id: I0d5cc1d63f1c314743337594b3222e001dc10bba