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

Change-Id: I7ee5f6f697835d06dc8cb910cddfdff0081c82d8