Remove unused function declarations am: 47c3ecb53a
am: 94b048eb69

Change-Id: Iaa1111990921ce225a6c8085debad04deeced2e2