Backport changes to release/3.3.x#192

shaobo-he-aws merged 6 commits intorelease/3.3.xcedar-policy/cedar-java:release/3.3.xfrom

shaobo/3.3.xcedar-policy/cedar-java:shaobo/3.3.xCopy head branch name to clipboard