Do not push only meta data to the client (#11490)

Change-Id: I589ede89583be90e99fbed6fe5c0c6c1ac4d7c0a