Merge with linaro master

Change-Id: Iec4f2d88db303141139632d1383d14167bd002aa