Fix CodeSniffer errors and warnings in includes/utils/

Change-Id: I5e59dd8136fcbd8dc833d7c9f6288656e13df6e9
Merge "Fix CodeSniffer errors and warnings in includes/utils/"