compatibility fix for 4.9 and 4.8 toolchains

Change-Id: Ib8b6208dfb386f094b4f14d8af9218772380c3c9