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

Change-Id: Ie73eb4aa0c0dbd66ab91d16e722bc3e3499892fa