linaro fixes/focal/external

Change-Id: I633e963a79104fc3d5fb0e9bc4426452100df9c4