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

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