Make mobileformat not change the output structure

Bug: 54607
Change-Id: If458ef94ba2e645ac1eb01ea037aa06a2d25b135
Merge "Make mobileformat not change the output structure"