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

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