Fix comments with #defines which exceed 80 characters am: 80cdca9294
am: f8f0cac03d

Change-Id: I9b08771e87774f6eca0c77e214ed55bef9270694