Submitting patches against latest policy again.

Dan