Bring some nightly love to flo and ABC reordering

Change-Id: Ic4546cdb697d5022c617e629fbf3cca64a8502b5