am 4a84af89: am b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev

* commit '4a84af896c830d6ef613d1baa607d472cf865073':
  Add new error code for Debug Context work.