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

Change-Id: Ia17590682f47cbb9ce2682afe0422f23863c2a42