Merge "Add missing include. Clang build fix." into mnc-dev