Merge "Reformat POLICY-SDK-APP test cases"