am d555a0d7: Merge "Cleanup"

* commit 'd555a0d77a02e4125b51f583492be9ba55674b03':
  Cleanup