Merge "GIC-600: Fix include ordering according to the coding style" into integration