policy updates

Change-Id: Ic2493ce5d0f79178a5127579b7cc8a44e85d3afd