[automerger skipped] Merge "Remove spurious function declaration" am: 090e05bd02  -s ours
am: aeac5d5f57  -s ours

Change-Id: Ic5c0ceb3398da3c3a92e370b3d7edb70884f902c