am ad8a510f: Merge change 3227 into donut

Merge commit 'ad8a510fcc3b853bd0dadcffb4433c465f2993b4'

* commit 'ad8a510fcc3b853bd0dadcffb4433c465f2993b4':
  Fix int to string mapping of exported properties. The value generated by the