Merge commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1' * commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1': Fixing the build by renaming private "string.h" header file.
Merge commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1' * commit 'b27849d3bf81bbbb1878a3fd4e1ae55ba5f953d1': Fixing the build by renaming private "string.h" header file.