Merge latest Linaro changes

Changes 2690 through 2693