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

* commit '7563a601e47db0a7c429fff1776f8a17a6157ce0':
  Address additional warnings found by GCC 4.9.