Fix unused code warnings

Change-Id: Ice941b81c83d2bda45c32aa11a1bf11559fefc2d
8 files changed