Linaro Fixes

Change-Id: I11394c1d3880914ff3f52eab7335988786c3ffeb