Merge "Policy API support for Rainy Day Decision Policy"