Fix build breakage on non-STE hardware

Change-Id: Ia9e655857b3661215952439a3a88b3dc95c94b64
Merge remote branch 'cyan/ics' into ics