Merge "Revert "Add change id for hidden api check hardening""