am 11326aa1: Merge "Code cleanup"

* commit '11326aa1b9482fefa0c0bdcb7e48cfeae6f9e33d':
  Code cleanup