Merge "Fix improper declaration/use of pointer."
am: a4567ab388

* commit 'a4567ab388e270760935673affec2e0d1682fbe7':
  Fix improper declaration/use of pointer.