Merge "Remove incorrect forward declaration"
am: 50d06c8849

Change-Id: Ia1da8a8cdcf866e74ab1c721c99459643a0363cf