Added a few policies and renumbered

Change-Id: Icec458b866c5c7c0182bd79136d283be257ffa97