Merge proposals

Linaro Landing Team: HiSilicon has no merge proposals.