Merge branch 'rakhimov-google_style' into develop
Convert comments from /* to //.