[CFL] Removing excessive consts

Change-Id: Ia97bc1c8b13f73b6dcdd40079535dba0b786c0c6
2 files changed