Merge "Remove hard-coded policy version from secilc step" am: df2ad0b4ab am: f7fd531a75
am: 33153c6c0d

Change-Id: I7d5075855823d64ea38c970f2e30dff9152a7391