am 063c3e21: Fix memset() bugs

* commit '063c3e2171e546957d8c40575740c29f234e307c':
  Fix memset() bugs