bug[ats_ATS138552]: Server queries not handling null correctly

Change-Id: I401a396c2763cafb341c4bfcb9a3ec6d4fed6b28
bug[ats_ATS138550]: Client queries not handling null correctly

Change-Id: I367438fc69e3334a797bb9ac4520f8daca0f3e1a