mw102[67] to appserver_hhvm

Change-Id: Ie3909a7e5d58d3d976612995049b95544a36d941
Merge "mw102[67] to appserver_hhvm" into production