am a152ed73: Merge "Fix global pointing to local variable."

* commit 'a152ed734f179ee2748d306f2eb57acbb4df1ace':
  Fix global pointing to local variable.