Ensure we do not provide null data to insert in ES
Bug: T95580 Change-Id: I06fa016b2c01f19788b4c836fe2f4b59f1188a2c