am 3b1fd35c: Merge "Eliminate duplicated code in export method" into honeycomb

* commit '3b1fd35c6876f7eb1d15db3095c3e57969783302':
  Eliminate duplicated code in export method