linaro fixes

Change-Id: Ic134afcf6dd95609372fad64f53b96f80f604092