am e2f95e42: am a34c9ca3: (-s ours) Add more error checking for ndc

Merge commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7' into gingerbread-plus-aosp

* commit 'e2f95e42c2ba27c7739b80ab9f52d1acfe1643e7':
  Add more error checking for ndc