Merge proposals dependent on lp://qastaging/~liuyq0307/linaro-android-build-tools/catch-submit-error

lp://qastaging/~liuyq0307/linaro-android-build-tools/catch-submit-error has no merge proposals.