Merge "Add change id for hidden api check hardening"