Merge "Added support for application/xacml+json in native app"