Merge "Update XACML tutorial code"