The Query functionality is experimental, so moving it to expiremental config

Change-Id: I55a0e442b57f11d0672b17f5cde68d338853cd4d
Merge "The Query functionality is experimental, so moving it to expiremental config"