Fix warnings for gcc-4.9

Change-Id: I07eb9f9d24e9524fbe28ffd563f5e9d079da49df