Merge "Eliminate duplicated code in export method" into honeycomb