Update MF and Zero

Change-Id: I266013960da2568ab230badd6324ffff22f28434