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

Change-Id: I3b2a8209551d73734696816e93878d0cc4b1a9a0