Update MF to head of wmf5 branch

Change-Id: I06eb51bfd5eb3c751be8dd94354a9c236bea44f9