GenericHighlighter fix reorder warrning

Change-Id: I8a8e53f1ef468da46bf589e60b9485153f79bb7a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>