Fix C++03 digraphs

Change-Id: I456469c27b60290ad8280fe12fcb82958e1a6c85