Merge "Update policy-parent for security fixes"