am 25458528: am dd2ed93e: Merge "Handle "CODE_ALREADY_PRESENT" message from Settings app" into jb-mr1.1-dev

* commit '25458528f07ef9f4710e669b74b76d687bbc7645':
  Handle "CODE_ALREADY_PRESENT" message from Settings app