Removed "const" from parameters that are passed by value, also fixes
msvc2015 compiler warnings.

Change-Id: I0c7555b4245fa55fabda1c27762fb9f0860bfa18