Yet another preseed attempt

Change-Id: If56eebae773380c702dc04330d2d3be634dcc0b1
Merge "Yet another preseed attempt" into production