Quick change for v7.9

Change-Id: Iaf65b24e429e24b5e68e589f0cb50a7ce00cd17b
Merge "Quick change for v7.9" into du44