am cc61802b: am ecfd8e73: acc error tweaks

Merge commit 'cc61802bb201f30566dbb05f7386543da173a827'

* commit 'cc61802bb201f30566dbb05f7386543da173a827':
  acc error tweaks