Merge "Add more error codes." into qt-qpr1-dev-plus-aosp