Convert legacy format on export

Bug: 66719
Change-Id: I30d1c82700577e30788348a7a6bc2c5274783bcc
Merge "Convert legacy format on export"