Recovery from my repo (for linaro)

Change-Id: I436532b1e207663ba6886e890865afa945132a84