Merge "Add policy api stability test"