[TASK] Fix various CGL violations (Revision 1)

Change-Id: If37b3032158149447ff54524aa41146d37e7d80d
Releases: master
Revision-Id: 77f3f9d2c2f09b310657f45741594d60ac66d2c5