Linaro 4.8 fixes.

Change-Id: Ib8de417fd14b965fb0b6fcaf8e6636c8928bb3c8