am 12ff91b0: am 53dc9044: Merge "Updated comments" into jb-mr2-dev

* commit '12ff91b05a055e6adffaad9bf7661a5d251c5b6c':
  Updated comments