hhvm fix

Change-Id: Ica9a6441f95f1bd2aded13fb87cf8e9dbf1c98a2
Merge "hhvm fix"