policy updates

Change-Id: If736e6c3526b609f8b3784a071512e00eb7a95dc