Quick change for v7.8

Change-Id: I1066f2bcc93f5b237ae4b6356ee5d1b73b20e45e