am d9798383: am 77338a29: Merge "Address additional warnings found by GCC 4.9."

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