am 5a6daf46: Merge "Cleanup"

* commit '5a6daf46cf52a3d7e95926c3fcbb3b3295159c29':
  Cleanup