am 85fb2066: Amend previous ndc commit

Merge commit '85fb20665feadda526ad422c093b859e8c4d40bc' into froyo-plus-aosp

* commit '85fb20665feadda526ad422c093b859e8c4d40bc':
  Amend previous ndc commit