Quick change for v8.0

Change-Id: I9ed04e01d0e9792c1f2853eaeb76a160124cb438