Merge "Quote variables in import script"
am: f658bf17d3

* commit 'f658bf17d3a1170989d802aa52320dd5373d9749':
  Quote variables in import script