Pushed to upstream

Fixing LayoutExportImportTest.  cc/ @shuyangzhou