Merge "Update secure policies for hbtp"