Some Linaro Changes

Change-Id: I077658eadd2dd437eb0d423b0793166ac521c41b