Merge "Add secure policies for hbtp"