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

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