Merge "Add missing const qualifier to compile with clang/llvm." into mnc-dev