Fix GCC 4.9 warnings

Change-Id: I277d0f03f67dfbb5ca5785adc7e8f31880202b41