Fix warnings for gcc 4.9

Change-Id: Id1126120e92c2da10f3b027b99374f83585ad9f2