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

Change-Id: I4343f14d5cfb748d559fb5dfae65bc15be6db442