am 847b82d8: am 89bc1395: Merge "Add more error checking for ndc" into froyo

Merge commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a' into kraken

* commit '847b82d8a6d3cc6969cbeeaf9ca7e879abab482a':
  Add more error checking for ndc