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

Change-Id: If28e0ea58ef447c3eda58ef3f5900251eabf8001