am 653de155: Reformat .inf file for better reading and remove redundancies

Merge commit '653de1559011a917d8f01dfd989ed26e32fa4a5b'

* commit '653de1559011a917d8f01dfd989ed26e32fa4a5b':
  Reformat .inf file for better reading and remove redundancies