Merge "Upgrade policy/parent & policy/common in api"