Merge "Fixed errorprone for CarrierApiTest" into qt-dev