Merge "Added new policy example to support junit test for new simplified API"