Merge "Remove unused function declarations" into cw-f-dev
am: 6199f023a7

Change-Id: I428b58de9f99935cee84250fc1d241c107acd5dc