am 28bc5dc3: Merge change 5633 into donut

Merge commit '28bc5dc3078a0f02ac066ea797fad765dea65f81'

* commit '28bc5dc3078a0f02ac066ea797fad765dea65f81':
  Remove individual .gitignore files and move their content to a single top-level one