Policy bug fixes.

Change-Id: I2fab74a7bf1b7d9f36b1c3b8e555902b94c2a89b