Merge "Remove unused declarations of dead code."
am: de3e912ad4

Change-Id: I9edb7ae5409dc966ef2e400a465139f3442ceda4