Bug 522137: Improve code quality

  fixed several trivial warnings

Change-Id: I7c011d6e753053e6dde207bfe21bea4c4e79e448
44 files changed