Merge "Add error id when build is debuggable." into sc-dev