am f1380e5b: Merge "Fix su."

* commit 'f1380e5ba41393dd2fd605692a0cd207782418b6':
  Fix su.