am 79522851: Merge "Clean up su."

* commit '79522851f014d82768d7d27d5676bdf98cbb595a':
  Clean up su.