Using policies for protected properties

Change-Id: I4789ebb2645171280185d2c76138e78d954b5954