am 2e1f8eb3: Merge "Reformat and update comments" into mnc-dev

* commit '2e1f8eb32826914d1dc2501820f237d4399c53b9':
  Reformat and update comments