Bump MF and WikiGrok

Change-Id: Ia16d321b3c4b1eda1219f5f4a8de811355d89065
Merge "Bump MF and WikiGrok" into wmf/1.25wmf7