Merge "Support query encapsualtion modes and metadata types." into rvc-dev am: 05be7e5109 am: 87b3299380

Change-Id: Iebf26db16adc7cc060ceabb8c3c8107204d42f4a