am 7a11ae26: am face0c02: am 46906276: Amend previous ndc commit

Merge commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17'

* commit '7a11ae268cfd9cd1a7887217c926bec19fdccf17':
  Amend previous ndc commit