am 3816305b: Merge "Address additional warnings found by GCC 4.9."

* commit '3816305b58b0eeb098f2f989ef03208d1f29f4da':
  Address additional warnings found by GCC 4.9.