am a259472c: Merge "Fix mismatch between declaration and forward declaration"

* commit 'a259472ca076ee230523e63502999be13a3f72d2':
  Fix mismatch between declaration and forward declaration