Merk-ify

Change-Id: I5ebe09ca080119ab4e81a6881b540802ea55ff17