GCC-4.8/4.9 compilation

Change-Id: Idd885f26714c70ffdfff2dcbbfd53d0f20370fed