Merge "Fix lint error in errorprone target (only in tm-qpr-dev)" into tm-qpr-dev