Merge "Support query encapsulation information." into rvc-dev am: acc2acafe7 am: b6f9d6aa03 am: 9318d709d6 am: 4eb6d7c348

Change-Id: I3386bb18e12a7741470671ebe7a9943aae646fd8